ci: ignore gir differences in version files

diff --git a/rust-bindings/rust/.gitlab-ci.yml b/rust-bindings/rust/.gitlab-ci.yml
index 26e6fff0cf9c1a5257f7165efd7762704feef034..af1cae598143d6d0a60170a6d78d3849a992996c 100644 (file)
--- a/rust-bindings/rust/.gitlab-ci.yml
+++ b/rust-bindings/rust/.gitlab-ci.yml
@@ -27,6 +27,7 @@ check:
   - cargo fmt --package ostree -- --check
   - rm -rf src/auto/
   - make gir
+  - git checkout -- sys/src/auto/versions.txt src/auto/versions.txt
   - git diff -R --exit-code
 
 # build

diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index 47d2b1b43f7203a59ba0df6e91cf6a1087180e9a..822ad7eaefaa570efedc7986bbe25de73785c9be 100644 (file)
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -12,9 +12,7 @@ target/tools/bin/gir:
 
 gir: target/tools/bin/gir
        target/tools/bin/gir -c conf/ostree-sys.toml
-       sed -i '/^from gir-files/d' sys/src/auto/versions.txt
        target/tools/bin/gir -c conf/ostree.toml
-       sed -i '/^from gir-files/d' src/auto/versions.txt
 
 gir-report: gir
        target/tools/bin/gir -c conf/ostree.toml -m not_bound

diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt
index e5155d7ea4f821fb07085cd2ec8a2b45ede73058..9cdf44f29da40698dbc28b76c6b8b62a0062c01d 100644 (file)
--- a/rust-bindings/rust/src/auto/versions.txt
+++ b/rust-bindings/rust/src/auto/versions.txt
@@ -1 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d1e88f9)
+Generated by gir (https://github.com/gtk-rs/gir @ d1e88f94)
+from gir-files (https://github.com/gtk-rs/gir-files @ ab7796a)

diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt
index e5155d7ea4f821fb07085cd2ec8a2b45ede73058..9cdf44f29da40698dbc28b76c6b8b62a0062c01d 100644 (file)
--- a/rust-bindings/rust/sys/src/auto/versions.txt
+++ b/rust-bindings/rust/sys/src/auto/versions.txt
@@ -1 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d1e88f9)
+Generated by gir (https://github.com/gtk-rs/gir @ d1e88f94)
+from gir-files (https://github.com/gtk-rs/gir-files @ ab7796a)